xend: fix server/netif.py so that it respects type=None.
authorKeir Fraser <keir@xensource.com>
Thu, 27 Sep 2007 16:44:03 +0000 (17:44 +0100)
committerKeir Fraser <keir@xensource.com>
Thu, 27 Sep 2007 16:44:03 +0000 (17:44 +0100)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
tools/python/xen/xend/server/netif.py

index fbf059b9fbf1d85348576fb9a8a4cf5d1b4ee58a..250fa848a0a2f16bb37f2ee031489486744e437e 100644 (file)
@@ -115,17 +115,15 @@ class NetifController(DevController):
         accel   = config.get('accel')
         sec_lab = config.get('security_label')
 
-        if not typ:
-            typ = xoptions.netback_type
-
         if not mac:
             raise VmError("MAC address not specified or generated.")
 
         devid = self.allocateDeviceID()
 
         back = { 'script' : script,
-                 'mac'    : mac,
-                 'type'   : typ }
+                 'mac'    : mac }
+        if typ:
+            back['type'] = typ
         if ipaddr:
             back['ip'] = ipaddr
         if bridge: